projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e90390b 5701fb3)
bitkeeper revision 1.1148 (411131f0ZrZwSSvmzkGHMRh1xnTq_Q)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Wed, 4 Aug 2004 18:58:56 +0000 (18:58 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Wed, 4 Aug 2004 18:58:56 +0000 (18:58 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-26dom0

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.